[asterisk-scf-commits] asterisk-scf/integration/slice.git branch "retry_deux" updated.

[Commits to the Asterisk SCF project code repositories]

branch "retry_deux" has been updated
       via  76c71589076a1152a4b9411e9e42d24c023baa14 (commit)
       via  68b207aeb191cd49674450b2238d8bc797e32c10 (commit)
      from  1b45a805fcca32c61b1ff2b9c2583d7dde1b1787 (commit)

Summary of changes:
 .../Core/Discovery/ServiceLocatorIf.ice            |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 slice/AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice


- Log -----------------------------------------------------------------
commit 76c71589076a1152a4b9411e9e42d24c023baa14
Merge: 1b45a80 68b207a
Author: Brent Eagles <beagles at digium.com>
Date:   Thu Mar 1 11:28:18 2012 -0330

    Merge master into retry_deux

diff --cc slice/AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice
index 0a84b67,447f5a6..bb9607d
mode 100644,100644..100755
--- a/slice/AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice
+++ b/slice/AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice
@@@ -197,7 -193,12 +199,12 @@@ module V
        /**
         * Method which unregisters this service from the service locator.
         */
 -      void unregister();
 +      idempotent void unregister(AsteriskSCF::System::V1::OperationContext operationContext);
+ 
 -       /**
 -        * Returns a sequence containing all ServiceLocatorParams added to this object.
 -        */
 -       idempotent ServiceLocatorParamsSeq getLocatorParams();
++      /**
++       * Returns a sequence containing all ServiceLocatorParams added to this object.
++       */
++      idempotent ServiceLocatorParamsSeq getLocatorParams();
     };
  
     /**

commit 68b207aeb191cd49674450b2238d8bc797e32c10
Author: Brent Eagles <beagles at digium.com>
Date:   Tue Jan 24 14:20:27 2012 -0330

    Added an accessor to the Service Management interface to get a sequence
    of the locator parameter objects that were added.

diff --git a/slice/AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice b/slice/AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice
index 4874c9d..447f5a6 100644
--- a/slice/AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice
+++ b/slice/AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice
@@ -111,6 +111,8 @@ module V1
        string id;
    };
 
+   sequence<ServiceLocatorParams> ServiceLocatorParamsSeq;
+
    /**
     * Interface used to perform service locator requests.
     */
@@ -192,6 +194,11 @@ module V1
        * Method which unregisters this service from the service locator.
        */
       void unregister();
+
+       /**
+        * Returns a sequence containing all ServiceLocatorParams added to this object.
+        */
+       idempotent ServiceLocatorParamsSeq getLocatorParams();
    };
 
    /**

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/slice.git