Merge branch 'hotfix-0.12.3'

Changelog

+CHANGELOG for hotfix version 0.12.3
+
+- Import the whole astakosclient package
+- Minor typos in help message
+
 CHANGELOG for hotfix version 0.12.2
 
 - Always use "details" call in neworks/subnets list

kamaki/cli/commands/cyclades.py

@@ -301,7 +301,7 @@ class server_info(_init_cyclades, _optional_json):
         choose_one = ('nics', 'stats', 'diagnostics')
         count = len([a for a in choose_one if self[a]])
         if count > 1:
-            raise CLIInvalidArgument('Invalid argument compination', details=[
+            raise CLIInvalidArgument('Invalid argument combination', details=[
                 'Arguments %s cannot be used simultaneously' % ', '.join(
                     [self.arguments[a].lvalue for a in choose_one])])
         self._run(server_id=server_id)

kamaki/clients/astakos/__init__.py

@@ -32,12 +32,13 @@
 # or implied, of GRNET S.A.
 
 from logging import getLogger
-from astakosclient import AstakosClient
-from astakosclient import AstakosClientException
+from astakosclient import *
+#  astakosclient contains: AstakosCLient, AstakosClientException
 
 from kamaki.clients import Client, ClientError, RequestManager, recvlog
 
 
+
 def _astakos_error(foo):
     def wrap(self, *args, **kwargs):
         try:

version

-0.12.2
+0.12.3