diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-07-12 14:53:34 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-07-12 14:53:34 -0300 |
| commit | f659de6e98073dc738b8d245e0ddb897f5bd3779 (patch) | |
| tree | e7bb8041f7f1133323bdce79c24814d26b2726f9 | |
| parent | 858244c7897ae2884d0b9d596acb3a2c7becbdbf (diff) | |
| parent | 9bd0262664a5cc50957646908af8fe7c92b00cc8 (diff) | |
Merge branch 'release-0.2.6' into develop
| -rw-r--r-- | CHANGELOG | 7 | ||||
| -rw-r--r-- | changes/bug2895_improve_leap_assert | 2 | ||||
| -rw-r--r-- | changes/consider_osx_tempdirs | 1 | ||||
| -rw-r--r-- | setup.py | 2 | ||||
| -rw-r--r-- | src/leap/common/__init__.py | 2 |
5 files changed, 8 insertions, 6 deletions
@@ -1,4 +1,9 @@ -0.2.2 Jun 28: +0.2.6 Jul 12: + o Improve leap_assert so that it only prints the traceback from the + leap_assert call up. Closes #2895 + o Add OSX temp directories to the basetests class. + +0.2.5 Jun 28: o Bugfix: use the provider's default language as default string. Also take care (and note) a possible case with a problematic provider misconfiguration. Closes #3029. diff --git a/changes/bug2895_improve_leap_assert b/changes/bug2895_improve_leap_assert deleted file mode 100644 index 8caea7e..0000000 --- a/changes/bug2895_improve_leap_assert +++ /dev/null @@ -1,2 +0,0 @@ - o Improve leap_assert so that it only prints the traceback from the - leap_assert call up. Closes #2895
\ No newline at end of file diff --git a/changes/consider_osx_tempdirs b/changes/consider_osx_tempdirs deleted file mode 100644 index 5cc20fb..0000000 --- a/changes/consider_osx_tempdirs +++ /dev/null @@ -1 +0,0 @@ - o Add OSX temp directories to the basetests class.
\ No newline at end of file @@ -56,7 +56,7 @@ setup( name='leap.common', # If you change version, do it also in # src/leap/common/__init__.py - version='0.2.5', + version='0.2.6', url='https://leap.se/', license='GPLv3+', author='The LEAP Encryption Access Project', diff --git a/src/leap/common/__init__.py b/src/leap/common/__init__.py index 2b30715..abeff0f 100644 --- a/src/leap/common/__init__.py +++ b/src/leap/common/__init__.py @@ -16,4 +16,4 @@ except ImportError: __all__ = ["certs", "check", "files", "events"] -__version__ = "0.2.5" +__version__ = "0.2.6" |