From: Frederic PAUT <frederic.paut@linux.intel.com>
Date: Mon, 24 Jun 2013 10:18:07 +0000 (+0200)
Subject: Merge branch 'master' into agent_future
X-Git-Tag: upstream/0.6.1~42^2~7
X-Git-Url: http://review.tizen.org/git/?p=contrib%2Fcloudeebus.git;a=commitdiff_plain;h=236c26d85a85cccc2cc43f8678524e6de3c909b4

Merge branch 'master' into agent_future

Conflicts:
	cloudeebus/cloudeebus.js
	cloudeebus/cloudeebus.py
	setup.py
---

236c26d85a85cccc2cc43f8678524e6de3c909b4
diff --cc TODO
index a3f4fd3,14f47b1..975ac47
--- a/TODO
+++ b/TODO
@@@ -10,12 -10,7 +10,6 @@@ Proxy object properties
  - support cloning proxies so that introspection is called only once per object type.
  
  
- API style:
- ----------
- - use "Promises" pattern for asynchronous APIs 
- - force JSON description of numbers as floats when needed 
- 
- 
  DBus service support:
  ---------------------
 -- support publishing a DBus service
  - support sending signals