diff --git a/_service b/_service
index 9e74a0d..f80cab0 100644
--- a/_service
+++ b/_service
@@ -5,8 +5,6 @@
oslo.config
-
-
enable
diff --git a/oslo.config-1.3.0.tar.gz b/oslo.config-1.3.0.tar.gz
deleted file mode 100644
index f30fde0..0000000
--- a/oslo.config-1.3.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1fa44f663f7109ccc3ddd393fbc5a7a077208e116f94e41ada7fbd977f27cbab
-size 49529
diff --git a/oslo.config-1.4.0.tar.gz b/oslo.config-1.4.0.tar.gz
new file mode 100644
index 0000000..185225b
--- /dev/null
+++ b/oslo.config-1.4.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:739e76e0a83ec585a3c0415140d9e6ba1b14c7f207e33643e8af7eb4346ffe07
+size 66544
diff --git a/python-oslo.config.changes b/python-oslo.config.changes
index a46ac26..7d0ba49 100644
--- a/python-oslo.config.changes
+++ b/python-oslo.config.changes
@@ -1,41 +1,164 @@
-------------------------------------------------------------------
-Wed Apr 2 09:05:43 UTC 2014 - speilicke@suse.com
+Mon Sep 22 09:37:53 UTC 2014 - dmueller@suse.com
-- Update to version 1.3.0:
+- add temporary workaround for dependencies on 1.4.0.0a3
+
+-------------------------------------------------------------------
+Sun Sep 21 09:04:13 UTC 2014 - tbechtold@suse.com
+
+- update to version 1.4.0:
+ * Looks for variable subtitution in the same group
+- Fix version Requires for python-netaddr
+- Adjust BuildRequires according to test-requirements.txt
+
+-------------------------------------------------------------------
+Fri Sep 12 08:14:23 UTC 2014 - dmueller@suse.com
+
+- update to 1.4.0.0a4:
+ * Updated from global requirements
+ * Log a fixed length string of asterisks for obfuscation
+ * Added link to bug tracker and documentation in oslo.config readme
+ * Bump hacking to version 0.9.2
+
+-------------------------------------------------------------------
+Tue Jul 29 20:23:37 UTC 2014 - dmueller@suse.com
+
+- update to 1.4.0a3:
+ * Changes imports order to pass H305, enables check
+ * generator: tweak how MultiStrOpt defaults are handled
+ * Add release notes for 1.3.0 and 1.4.0.0a1/2
+ * Hook up config fixture docs
+ * Hook IPOpt class into the docs
+ * Replaced 'e.g.' with 'for example'
+ * Add cfgfilter.ConfigFilter
+ * generator: remove the default sanitizer feature
+ * cfg,generator: add Opt.sample_default attribute
+ * generator: refactor MultiStrOpt handling
+ * Fix flaws in methods' docstring
+ * Introduce Opts for IP addresses
+ * Refactors _Namespace to make the code clearer
+ * Add oslo-config-generator
+ * Add CLI option support to config fixture
+ * Updated from global requirements
+ * Remove print statement from types.Dict
+ * Add warning about interpolating values from groups
+ * Add more tests for positional CLI opts
+ * Add test case for hyphenated option names
+ * Fixes an issue validating max integer values
+ * Bump hacking to 0.9.x series
+ * Updated from global requirements
+ * Add a doc sample for how to use the required field
+ * log: string format arguments changed to function parameters
+ * Fix deprecated_opts for cli options
+ * Reject option names prefixed with '_'
+ * Graduate config fixture
+ * Updated from global requirements
+ * Fix test_version on Python 3.4
+ * Add section titles and fix markup of docstring
+ * Avoid using too generic names in _Namespace
+ * Import run_cross_tests.sh from oslo-incubator
+ * Move py33 env before py2x
+
+-------------------------------------------------------------------
+Fri Jun 27 11:11:26 UTC 2014 - dmueller@suse.com
+
+- go back to released version (1.3.0)
+
+-------------------------------------------------------------------
+Fri Jun 20 00:02:53 UTC 2014 - cloud-devel@suse.de
+
+- Update to version oslo.config-1.3.0.29.ge0172be:
+ * Updated from global requirements
+ * Add more tests for positional CLI opts
+
+-------------------------------------------------------------------
+Thu Jun 19 00:01:57 UTC 2014 - cloud-devel@suse.de
+
+- Update to version oslo.config-1.3.0.26.g582e1a3:
+ * Remove print statement from types.Dict
+ * Add test case for hyphenated option names
+
+-------------------------------------------------------------------
+Sun Jun 15 00:03:00 UTC 2014 - cloud-devel@suse.de
+
+- Update to version oslo.config-1.3.0.22.g1746fd2:
+ * Fixes an issue validating max integer values
+ * Bump hacking to 0.9.x series
+
+-------------------------------------------------------------------
+Wed Jun 11 00:44:12 UTC 2014 - cloud-devel@suse.de
+
+- Update to version oslo.config-1.3.0.19.g6c283cd:
+ * Updated from global requirements
+ * Add a doc sample for how to use the required field
+
+-------------------------------------------------------------------
+Tue May 27 23:41:24 UTC 2014 - cloud-devel@suse.de
+
+- Update to version oslo.config-1.3.0.16.g8b4bf0f:
+ * log: string format arguments changed to function parameters
+
+-------------------------------------------------------------------
+Sat May 10 00:04:44 UTC 2014 - cloud-devel@suse.de
+
+- Update to version oslo.config-1.3.0.15.g78c2bc9:
+ * Fix deprecated_opts for cli options
+
+-------------------------------------------------------------------
+Thu May 8 00:04:05 UTC 2014 - cloud-devel@suse.de
+
+- Update to version oslo.config-1.3.0.13.gbdb0814:
+ * Updated from global requirements
+
+-------------------------------------------------------------------
+Wed May 7 00:03:03 UTC 2014 - cloud-devel@suse.de
+
+- Update to version oslo.config-1.3.0.11.ga4bb2e4:
+ * Add section titles and fix markup of docstring
+
+-------------------------------------------------------------------
+Tue May 6 00:06:43 UTC 2014 - cloud-devel@suse.de
+
+- Update to version oslo.config-1.3.0.9.g7240ad9:
+ * Reject option names prefixed with '_'
+ * Fix docstring for _Namespace._get_cli_value
+
+-------------------------------------------------------------------
+Sun May 4 00:05:07 UTC 2014 - cloud-devel@suse.de
+
+- Update to version oslo.config-1.3.0.5.gb3ed1ac:
+ * Graduate config fixture
+
+-------------------------------------------------------------------
+Sat Apr 26 00:01:23 UTC 2014 - cloud-devel@suse.de
+
+- Update to version oslo.config-1.3.0.4.g0a66c27:
+ * Fix test_version on Python 3.4
+
+-------------------------------------------------------------------
+Tue Apr 15 23:52:20 UTC 2014 - cloud-devel@suse.de
+
+- Update to version oslo.config-1.3.0.3.g78225a5:
+ * Avoid using too generic names in _Namespace
+
+-------------------------------------------------------------------
+Sat Apr 5 00:28:08 UTC 2014 - cloud-devel@suse.de
+
+- Update to version oslo.config-1.3.0.2.g4b8b206:
+ * Import run_cross_tests.sh from oslo-incubator
+
+-------------------------------------------------------------------
+Wed Apr 2 00:36:07 UTC 2014 - cloud-devel@suse.de
+
+- Update to version oslo.config-1.3.0.1.g1dc9e67:
+ * Move py33 env before py2x
+ 1.3.0
+
+-------------------------------------------------------------------
+Mon Mar 10 16:33:25 UTC 2014 - cloud-devel@suse.de
+
+- Update to version oslo.config-1.3.0a0.40.gb347519:
* Include the 'meta' trove classifiers for python versions
- * Do substitution on overrides and defaults too
- * Follow style guide for help strings
- * Updated from global requirements
- * Convert to oslo.test
- * Fix a whitespace in a comment
- * Fix docstring of parsing order
- * Switch over to oslosphinx
- * Remove extraneous vim configuration comments
- * Fix misspellings in oslo.config
- * Add py33 trove classifier
- * Support building wheels (PEP-427)
- * Add Style Guide for help of config options
- * Add docs for types
- * Throw exception if --config-dir doesn't exist
- * Remove copyright from empty files
- * Implemented support for custom opt types
- * Fix for parsing error with Dollar Sign ($) in values
- * Utilizes assertIsNone and assertIsNotNone
- * Fix spelling errors in docstrings and comments
- * Added support of operator '=='
- * Updated from global requirements
- * Updated from global requirements
- * Fix to make ConfigOpts no longer obscure IOErrors
- * Replace assertEquals with assertEqual
- * Updated from global requirements
- * Add the ability to validate default options value
-- Switch to Icehouse release
-
--------------------------------------------------------------------
-Thu Mar 27 10:19:08 UTC 2014 - dmueller@suse.com
-
-- switch back to released version of oslo.config (which is
- recommended for Icehouse)
-------------------------------------------------------------------
Wed Mar 5 01:11:55 UTC 2014 - cloud-devel@suse.de
diff --git a/python-oslo.config.spec b/python-oslo.config.spec
index 6c50f71..0aba0a0 100644
--- a/python-oslo.config.spec
+++ b/python-oslo.config.spec
@@ -17,7 +17,7 @@
Name: python-oslo.config
-Version: 1.3.0
+Version: 1.4.0
Release: 0
Url: https://launchpad.net/oslo/
Summary: OpenStack configuration API
@@ -28,9 +28,8 @@ Source99: rpmlintrc
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: fdupes
BuildRequires: python-devel
-BuildRequires: python-pbr
-# Documentation requirements:
BuildRequires: python-oslosphinx
+BuildRequires: python-pbr
# Test requirements:
#BuildRequires: python-coverage >= 3.6
%if 0%{?suse_version} && 0%{?suse_version} <= 1110
@@ -39,15 +38,20 @@ BuildRequires: python-discover
%endif
BuildRequires: python-fixtures >= 0.3.14
BuildRequires: python-mock >= 1.0
+BuildRequires: python-netaddr
BuildRequires: python-oslotest
BuildRequires: python-python-subunit >= 0.0.18
-BuildRequires: python-six >= 1.5.2
-BuildRequires: python-testrepository >= 0.0.17
+BuildRequires: python-six
+BuildRequires: python-stevedore
+BuildRequires: python-testrepository >= 0.0.18
BuildRequires: python-testscenarios >= 0.4
-BuildRequires: python-testtools >= 0.9.32
+BuildRequires: python-testtools >= 0.9.34
+Requires: python-netaddr >= 0.7.12
Requires: python-pbr
-Requires: python-six >= 1.5.2
+Requires: python-six >= 1.7
+Requires: python-stevedore >= 0.14
Provides: python-oslo-config = 2013.2
+Provides: python-oslo.config = 1.4.0.0a3
Obsoletes: python-oslo-config < 2013.2
%if 0%{?suse_version} && 0%{?suse_version} <= 1110
Requires: python-argparse
@@ -96,6 +100,7 @@ testr init && testr run --parallel
%files
%defattr(-,root,root,-)
%doc LICENSE README.rst AUTHORS
+%{_bindir}/oslo-config-generator
%{python_sitelib}/oslo
%{python_sitelib}/*.egg-info
%{python_sitelib}/*-nspkg.pth