<feed xmlns='http://www.w3.org/2005/Atom'>
<title>puppet/ext, branch master</title>
<subtitle>[no description]</subtitle>
<id>https://git.osdyson.ru/pkg-puppet/puppet/atom?h=master</id>
<link rel='self' href='https://git.osdyson.ru/pkg-puppet/puppet/atom?h=master'/>
<link rel='alternate' type='text/html' href='https://git.osdyson.ru/pkg-puppet/puppet/'/>
<updated>2014-10-24T11:27:50Z</updated>
<entry>
<title>Imported Upstream version 3.7.2</title>
<updated>2014-10-24T11:27:50Z</updated>
<author>
<name>Stig Sandbeck Mathisen</name>
<email>ssm@debian.org</email>
</author>
<published>2014-10-24T11:27:50Z</published>
<link rel='alternate' type='text/html' href='https://git.osdyson.ru/pkg-puppet/puppet/commit/?id=deaf3b4969d6518166fd08a10a387c45a4fc58ec'/>
<id>urn:sha1:deaf3b4969d6518166fd08a10a387c45a4fc58ec</id>
<content type='text'>
</content>
</entry>
<entry>
<title>(maint) Update puppet_for_the_win for foss-3.7.x.yaml</title>
<updated>2014-10-10T16:49:00Z</updated>
<author>
<name>Josh Cooper</name>
<email>josh@puppetlabs.com</email>
</author>
<published>2014-10-10T16:49:00Z</published>
<link rel='alternate' type='text/html' href='https://git.osdyson.ru/pkg-puppet/puppet/commit/?id=fc6cd7a53cf88cad9d24152c55b805bc3171ac50'/>
<id>urn:sha1:fc6cd7a53cf88cad9d24152c55b805bc3171ac50</id>
<content type='text'>
Update puppet_for_the_win dependency so dev builds use facter 2.2.0
</content>
</entry>
<entry>
<title>Merge pull request #3074 from melissaanne/stable</title>
<updated>2014-10-09T21:11:38Z</updated>
<author>
<name>Kylo Ginsberg</name>
<email>kylo@puppetlabs.com</email>
</author>
<published>2014-10-09T21:11:38Z</published>
<link rel='alternate' type='text/html' href='https://git.osdyson.ru/pkg-puppet/puppet/commit/?id=4e88867c87db4a2ce6028d865ba4c4a6f7950166'/>
<id>urn:sha1:4e88867c87db4a2ce6028d865ba4c4a6f7950166</id>
<content type='text'>
(PUP-3227) Address man page ownship conflicts</content>
</entry>
<entry>
<title>(PUP-3315) Update build_defaults for MSI builder</title>
<updated>2014-10-01T21:44:37Z</updated>
<author>
<name>Rob Reynolds</name>
<email>ferventcoder@gmail.com</email>
</author>
<published>2014-10-01T21:44:37Z</published>
<link rel='alternate' type='text/html' href='https://git.osdyson.ru/pkg-puppet/puppet/commit/?id=8df1aa9914bfd17dc244cc56e28d3976265b3cfb'/>
<id>urn:sha1:8df1aa9914bfd17dc244cc56e28d3976265b3cfb</id>
<content type='text'>
This moves the sha1 to include the recent changes to the MSI that add more
clarification on FQDN of Puppet master.
</content>
</entry>
<entry>
<title>(PUP-3126) Bump vendored gem dependencies</title>
<updated>2014-10-01T00:25:21Z</updated>
<author>
<name>Josh Cooper</name>
<email>josh@puppetlabs.com</email>
</author>
<published>2014-10-01T00:23:46Z</published>
<link rel='alternate' type='text/html' href='https://git.osdyson.ru/pkg-puppet/puppet/commit/?id=96355a181c3f60c3cda3f259cd51b45b91fb1506'/>
<id>urn:sha1:96355a181c3f60c3cda3f259cd51b45b91fb1506</id>
<content type='text'>
Include win32-service 0.8.6 when building MSIs.
</content>
</entry>
<entry>
<title>(PUP-3126) upgrade win32-service to 0.8.6</title>
<updated>2014-09-29T15:16:39Z</updated>
<author>
<name>Rob Reynolds</name>
<email>ferventcoder@gmail.com</email>
</author>
<published>2014-09-29T15:16:39Z</published>
<link rel='alternate' type='text/html' href='https://git.osdyson.ru/pkg-puppet/puppet/commit/?id=b5922248c308cd86f379ba7518dafa722c756e00'/>
<id>urn:sha1:b5922248c308cd86f379ba7518dafa722c756e00</id>
<content type='text'>
This upgrades the win32-service gem to at least 0.8.6 to take advantage
of the fixes to the service gem. This change includes only the fixes that
we have already applied patches to in puppet-win32-ruby.
</content>
</entry>
<entry>
<title>Imported Upstream version 3.7.1</title>
<updated>2014-09-16T07:18:18Z</updated>
<author>
<name>Stig Sandbeck Mathisen</name>
<email>ssm@debian.org</email>
</author>
<published>2014-09-16T07:18:18Z</published>
<link rel='alternate' type='text/html' href='https://git.osdyson.ru/pkg-puppet/puppet/commit/?id=52dd92b16375a2ab1242e3fadb42567abd798cd6'/>
<id>urn:sha1:52dd92b16375a2ab1242e3fadb42567abd798cd6</id>
<content type='text'>
</content>
</entry>
<entry>
<title>(PUP-3227) Address man page ownship conflicts</title>
<updated>2014-09-10T18:54:49Z</updated>
<author>
<name>Melissa Stone</name>
<email>melissa@puppetlabs.com</email>
</author>
<published>2014-09-10T18:34:18Z</published>
<link rel='alternate' type='text/html' href='https://git.osdyson.ru/pkg-puppet/puppet/commit/?id=55f097184779848378c7f08112ac1140c4f83d68'/>
<id>urn:sha1:55f097184779848378c7f08112ac1140c4f83d68</id>
<content type='text'>
Prior to this commit, upgrading from puppet=2.7.23-1~deb7u3 and
puppetmaster=2.7.23-1~deb7u3 to puppet=3.7.0.29-1puppetlabs1 and
puppetmaster=3.7.0.29-1puppetlabs1 fails. I believe this problem is due
to how Debian chose to package puppet-common, which owns
`/usr/share/man/man8/puppet-master.8.gz`.

This commit adds in a `Conflicts:` to the puppetmaster and
puppetmaster-common packages to make sure that we can successfully
upgrade from these older package versions. However, if a user has
puppetmaster and puppet older than 3.3.0 installed on a machine, and
only upgrades puppetmaster, this will uninstall the puppet package from
the system.
</content>
</entry>
<entry>
<title>Imported Upstream version 3.7.0</title>
<updated>2014-09-07T08:14:36Z</updated>
<author>
<name>Stig Sandbeck Mathisen</name>
<email>ssm@debian.org</email>
</author>
<published>2014-09-07T08:14:36Z</published>
<link rel='alternate' type='text/html' href='https://git.osdyson.ru/pkg-puppet/puppet/commit/?id=d4b83be375ac1dead058e091191ee7c7b7c24c8a'/>
<id>urn:sha1:d4b83be375ac1dead058e091191ee7c7b7c24c8a</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'upstream/master' into stable</title>
<updated>2014-09-03T19:44:38Z</updated>
<author>
<name>Josh Partlow</name>
<email>joshua.partlow@puppetlabs.com</email>
</author>
<published>2014-09-03T19:44:38Z</published>
<link rel='alternate' type='text/html' href='https://git.osdyson.ru/pkg-puppet/puppet/commit/?id=d02943ffc0d3fa6e12758ce272bb332e569725c6'/>
<id>urn:sha1:d02943ffc0d3fa6e12758ce272bb332e569725c6</id>
<content type='text'>
* upstream/master: (767 commits)
  (maint) Namespace constant declaration in specs to prevent warnings
  (maint) Expect test to fail on windows ruby 2.0 x86
  (PUP-3069) Fix path expansion for environment.conf test on Win
  (PUP-2349) Add windows specific expectation for deprecation_warning
  (PUP-2349) Add windows specific expectation for deprecation_warning
  (PUP-3069) Clear configuration_file for tests
  (PUP-3069) Test both future and current parser with default_manifest
  (PUP-3069) Update default_manifest setting descriptions
  (PUP-3069) Change restrict_environment_manifest name
  (PUP-3163) Create and manage the mode of $reportsdir
  (maint) Clear record of configured deprecated settings
  (PUP-3069) Add an integration spec for default_manifest
  (PUP-3069) Halt compile if environment has manifest conflict
  (PUP-3069) Add spec test for new default options
  (PUP-3069) Add default manifest settings
  PUP-3155 Improve spec tests around the PE puppet version
  (PUP-3153) Guard against nil when closing Uniquefiles
  (PUP-2984) Remove old installation directory when going from x64 to x86
  (PUP-1884) Migrate MSI deps into puppet repo
  (PUP-3154) Create and manage the mode of $statedir on redhat
  ...
</content>
</entry>
</feed>
