Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

base fork: puppetlabs/puppet
base: dc06b8d4b2
...
head fork: puppetlabs/puppet
compare: c9386b541e
  • 4 commits
  • 4 files changed
  • 0 commit comments
  • 2 contributors
Commits on May 02, 2012
MosesMendoza MosesMendoza Update CHANGELOG, spec files for 2.7.14 574e4c8
MosesMendoza MosesMendoza Merge branch '2.7rc' into 2.7.x 94dee10
Commits on May 03, 2012
Daniel Pittman daniel-pittman Remove a bad test that can lead to random hangs...
Signed-off-by: Daniel Pittman <daniel@puppetlabs.com>
80fe59d
Daniel Pittman daniel-pittman Merge branch '2.7.x'
Conflicts:
	spec/integration/network/server/mongrel_spec.rb

Signed-off-by: Daniel Pittman <daniel@puppetlabs.com>
c9386b5
8 CHANGELOG
View
@@ -1,19 +1,13 @@
-2.7.14rc3
+2.7.14
===
42b20be (#13682) Fix acceptance test failures
dce3c32 (#13682) Rename Puppet::Module::Tool to Puppet::ModuleTool
5117e12 (maint) Ensure every file has a trailing newlines
c255414 (#14036) Add upstart tests
dc3bb9f (#14036) Handle upstart better
-
-2.7.14rc2
-===
74e462f (#14060) Fix quoting of commands to interpolate inside the shell.
796a072 Modernize the style of the shell exec provider tests.
934ec89 Improve deprecation warning for dynamic lookup
-
-2.7.14rc1
-===
0d9e852 Removed duplication of compiling a catalog
d67711d Cleaner test for create_resources doing nothing
2d3cc63 Fixing problem caused by activerecord
5 conf/redhat/puppet.spec
View
@@ -5,7 +5,7 @@
%global confdir conf/redhat
Name: puppet
-Version: 2.7.13
+Version: 2.7.14
#Release: 0.1rc1%{?dist}
Release: 1%{?dist}
Summary: A network tool for managing many disparate systems
@@ -285,6 +285,9 @@ fi
rm -rf %{buildroot}
%changelog
+* Wed May 02 2012 Moses Mendoza <moses@puppetlabs.com> - 2.7.14-1
+- Update for 2.7.14
+
* Tue Apr 10 2012 Matthaus Litteken <matthaus@puppetlabs.com> - 2.7.13-1
- Update for 2.7.13
5 conf/suse/puppet.spec
View
@@ -4,7 +4,7 @@
Summary: A network tool for managing many disparate systems
Name: puppet
-Version: 2.7.12
+Version: 2.7.14
Release: 1%{?dist}
License: Apache 2.0
Group: Productivity/Networking/System
@@ -136,6 +136,9 @@ find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -exec chmod a-x '{}' \;
%{__rm} -rf %{buildroot}
%changelog
+* Wed May 02 2012 Moses Mendoza <moses@puppetlabs.com> - 2.7.14-1
+- Update for 2.7.14
+
* Mon Mar 12 2012 Michael Stahnke <stahnma@puppetlabs.com> - 2.7.12-1
- Update for 2.7.12
7 spec/integration/network/server/mongrel_spec.rb
View
@@ -23,13 +23,6 @@ def port
@server.unlisten if @server.listening?
end
- describe "before listening" do
- it "should not be reachable at the specified address and port" do
- lambda { Net::HTTP.get('127.0.0.1', '/', port) }.
- should raise_error(Errno::ECONNREFUSED)
- end
- end
-
describe "when listening" do
it "should be reachable on the specified address and port" do
@server.listen

No commit comments for this range

Something went wrong with that request. Please try again.