(An Untitled Masterwork)
ActivePublic
Actions

Authored by Paladox on Jun 25 2018, 2:58 PM.

Tags

None

Referenced Files

	F22640061:
	Jun 25 2018, 2:58 PM

Subscribers

None

	root@puppet-paladox:/var/lib/git/operations/puppet# git rebase origin
	First, rewinding head to replay your work on top of it...
	error: The following untracked working tree files would be overwritten by checkout:
	modules/jmxtrans/LICENSE
	modules/jmxtrans/README.md
	modules/jmxtrans/manifests/init.pp
	modules/jmxtrans/manifests/metrics.pp
	modules/jmxtrans/manifests/metrics/jvm.pp
	modules/jmxtrans/templates/jmxtrans.default.erb
	modules/jmxtrans/templates/jmxtrans.json.erb
	modules/kafkatee/README.md
	modules/kafkatee/files/kafkatee_logrotate
	modules/kafkatee/files/kafkatee_rsyslog.conf
	modules/kafkatee/manifests/init.pp
	modules/kafkatee/manifests/instance.pp
	modules/kafkatee/manifests/output.pp
	modules/kafkatee/templates/initscripts/kafkatee.systemd.erb
	modules/kafkatee/templates/kafkatee.conf.erb
	modules/kafkatee/templates/kafkatee_instance_logrotate.erb
	modules/kafkatee/templates/output.conf.erb
	modules/varnishkafka/README.md
	modules/varnishkafka/files/varnishkafka_ganglia.py
	modules/varnishkafka/files/varnishkafka_logrotate
	modules/varnishkafka/files/varnishkafka_rsyslog.conf
	modules/varnishkafka/manifests/init.pp
	modules/varnishkafka/manifests/instance.pp
	modules/varnishkafka/manifests/monitor/ganglia.pp
	modules/varnishkafka/manifests/monitor/statsd.pp
	modules/varnishkafka/templates/initscripts/varnishkafka.systemd.erb
	modules/varnishkafka/templates/initscripts/varnishkafka.upstart.erb
	modules/varnishkafka/templates/varnishkafka-stats.logrotate.erb
	modules/varnishkafka/templates/varnishkafka.conf.erb
	Please move or remove them before you switch branches.
	Aborting
	could not detach HEAD

Event Timeline

Paladox created this paste.Jun 25 2018, 2:58 PM

(An Untitled Masterwork)ActivePublicActions

Event Timeline

(An Untitled Masterwork)
ActivePublic
Actions