solar/resources
Bogdan Dobrelya 4470c7d200 Merge branch 'master' into nova-api
Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>

Conflicts:
	example-puppet.py
2015-07-29 11:47:56 +02:00
..
2015-06-29 13:33:57 +00:00
2015-06-29 13:33:57 +00:00
2015-07-22 23:27:04 +00:00
2015-07-17 10:21:44 +00:00
2015-07-17 10:21:44 +00:00
2015-07-17 10:21:44 +00:00
2015-07-22 23:27:04 +00:00
2015-07-17 09:30:59 +02:00
2015-07-22 23:27:04 +00:00
2015-07-20 22:30:33 +00:00
2015-07-20 09:36:18 +00:00
2015-06-03 10:16:01 +02:00
2015-07-17 11:53:30 +00:00
2015-07-17 11:53:30 +00:00