fancsali/cdist-backup
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
5500 commits 91 branches 177 tags 18 MiB
Commit graph

1282 commits

Author SHA1 Message Date
Nico Schottelius
81c92e5cc4 merge all resolver code into cdist_object (to gain the requirement searching code 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-12-14 08:41:56 +01:00
Nico Schottelius
16340b7d34 report on broken requirements, begin to satisfy requirements 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-12-14 08:41:17 +01:00
Nico Schottelius
6b6037d9bb todos for a simple resolver 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-12-13 06:44:55 +01:00
Nico Schottelius
2e81379c18 add very simple solver for dependencies 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-12-13 06:41:33 +01:00
Jake Guffey
7d7ad2630c Fix issue #147 
--state absent should imply --stopped.
 2012-12-11 11:15:21 -05:00
Nico Schottelius
67c7351bec install the right package, not pyro... 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-12-09 11:49:26 -08:00
Nico Schottelius
ed7b6d1a68 add linebreak, add broken require 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-12-06 00:01:01 +01:00
Nico Schottelius
fe143d57b8 add new type: __rbenv 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-12-05 23:43:24 +01:00
Nico Schottelius
3167ececc6 add owner/group support to __git 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-12-05 23:16:03 +01:00
Nico Schottelius
8b91e3116a create working version of __git 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-12-05 23:07:21 +01:00
Nico Schottelius
5a3dc38e60 Merge branch 'master' into type__git 2012-12-05 22:46:07 +01:00
Steven Armstrong
56b6c95ed4 implement conf-dir from CDIST_PATH environment variable 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2012-11-30 16:46:17 +01:00
Nico Schottelius
f37f3d201c __ssh_authorized_key has been superseeded by __ssh_authorized_keys 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-30 14:41:47 +01:00
Steven Armstrong
1ef5bcaa74 new type: __ssh_authorized_keys - manage ssh authorized_keys files 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2012-11-30 11:59:38 +01:00
Steven Armstrong
3a419ed58b make type explorers executable after transfering them 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2012-11-30 10:31:15 +01:00
Nico Schottelius
868421bf16 Update examples to match new parameters 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-30 10:01:37 +01:00
Nico Schottelius
1bd27fffae __jail: started -> stopped, correct help output 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-27 10:57:10 +01:00
Nico Schottelius
fd8fdf8b54 Merge branch 'master' into type__jail_boolean 2012-11-27 08:58:14 +01:00
Nico Schottelius
8bf196fdc0 add helpful log message when resolving dependencies 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-20 22:41:38 +01:00
Nico Schottelius
b996dcbae1 bugfix __qemu_img 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-19 17:42:39 +01:00
Nico Schottelius
8408f433e9 remove type from here - goes into cdist-nico repo 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-19 17:27:35 +01:00
Nico Schottelius
a6452cfabd rename type to reflect new environment 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-19 17:24:38 +01:00
Nico Schottelius
3dfad32d4c add new type: __localch_kvm_vm 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-19 17:24:01 +01:00
Nico Schottelius
2fe647a1f7 Revert "implement before/after to declare dependencies and deprecate require" 
Comment from asteven:
    Some problems showed up while updating the docs and tests.
    You should revert the merge for now.

This reverts commit 84770b9ef2.
 2012-11-19 15:17:46 +01:00
Nico Schottelius
d4fc49fa6b begin manpage 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-19 15:13:57 +01:00
Nico Schottelius
d419722a24 adapt documentation to use boolean parameter as well 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-19 13:43:45 +01:00
Nico Schottelius
bb19902581 Merge branch 'master' into type__jail_boolean 2012-11-19 13:40:59 +01:00
Nico Schottelius
4718b81a08 Documentation cleanup (old pre-boolean variant) 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-19 13:40:35 +01:00
Nico Schottelius
67545eda79 Merge remote-tracking branch 'steven/issue_140' 2012-11-19 13:35:21 +01:00
Nico Schottelius
4ab51df2c8 Merge pull request #139 from asteven/2.1_before-after 
implement before/after to declare dependencies and deprecate require
 2012-11-19 04:27:09 -08:00
Nico Schottelius
4e3bab81d5 Merge pull request #138 from asteven/issue_138 
file from stdin is broken
 2012-11-19 04:17:43 -08:00
Steven Armstrong
7f0ae7928a fix state explorer to properly detect already existing ppa 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2012-11-19 13:05:23 +01:00
Steven Armstrong
84770b9ef2 implement before/after to declare dependencies and deprecate require 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>

--whitespace

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2012-11-19 12:29:49 +01:00
Steven Armstrong
6d430524f1 binary all the way, fixes issue #138 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2012-11-19 12:04:07 +01:00
Nico Schottelius
13968d16f6 change __jail to boolean, fixes #128 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-19 10:36:52 +01:00
Nico Schottelius
327a0f2844 remove --groups from __user type 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-18 23:31:19 +01:00
Steven Armstrong
b0ac5fe78d update __jail type to match changed signature of __directory: fixes #135 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2012-11-16 21:18:08 +01:00
Nico Schottelius
9c5926f697 Merge branch '__user_groups' of https://github.com/asteven/cdist 2012-11-16 15:58:57 +01:00
Nico Schottelius
500c194328 Merge branch 'issue_126' of https://github.com/asteven/cdist 2012-11-16 15:34:58 +01:00
Steven Armstrong
28e8632097 new type: __user_group: manage user groups 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2012-11-16 15:31:33 +01:00
Steven Armstrong
6c685e61d5 fixes #126 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2012-11-16 15:27:32 +01:00
Steven Armstrong
e4910933b1 __apt_ppa: /enabled/present/ -e /disabled/absent/ 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2012-11-16 14:56:20 +01:00
Nico Schottelius
e6bf226036 convert __rvm_gmeset to boolean parameter 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-15 17:47:06 +01:00
Nico Schottelius
18dd0ebd33 ensure global and type explorers are executable on the remote side 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-15 17:37:15 +01:00
Nico Schottelius
80c6592ec8 add hints to related manpages 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-15 09:49:37 +01:00
Nico Schottelius
2fca87eda8 ++comment 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-15 09:34:19 +01:00
Nico Schottelius
a498330bd3 remove _read_stdin and open stdin file in non-binary mode 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-15 09:32:44 +01:00
Nico Schottelius
482ec3c5d8 make --default boolean in type __rvm_ruby 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-07 19:27:17 +01:00
Nico Schottelius
3d4bb3837f documentation cleanups 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-07 19:22:02 +01:00
Nico Schottelius
0eda57986f remove parameter changing code in __key_value (fixes #114,#36) 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-07 18:28:58 +01:00
Nico Schottelius
344e08ddda Archive __autofs types (fixes #116) 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-07 18:22:25 +01:00
Nico Schottelius
47424bf200 update __package* manpages 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-07 18:15:15 +01:00
Nico Schottelius
13d6644966 do not report errors on missing gemset 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-07 18:10:15 +01:00
Nico Schottelius
347c620eed indent 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-07 18:08:03 +01:00
Nico Schottelius
aeff2bcb0f indention 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-07 18:06:11 +01:00
Nico Schottelius
82830f191d link __process to __start_on_boot and vice versa 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-07 18:04:49 +01:00
Nico Schottelius
7814ece7b7 remove parameter changing code 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-07 18:01:30 +01:00
Nico Schottelius
2cfa046cdd indentions, whitespace 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-07 17:57:47 +01:00
Nico Schottelius
8ab408f890 remove parameter change code 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-07 17:52:05 +01:00
Nico Schottelius
7a44f30574 simplify manifest 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-07 17:47:55 +01:00
Nico Schottelius
a0add17cf8 ++exit 1 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-07 17:44:54 +01:00
Nico Schottelius
265d1af56a rename vm to diskimage, ensure state is setup 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-07 17:40:39 +01:00
Nico Schottelius
ace897de25 simplify timezone manifest 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-07 17:28:27 +01:00
Steven Armstrong
6adb20b829 __ssh_authorized_key: /installed/present/ 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2012-11-07 16:57:31 +01:00
Steven Armstrong
324a88c435 __timezone: set timezone in /etc/timezone on debuntu 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2012-11-07 16:57:31 +01:00
Steven Armstrong
f769b395c2 __file: implement --state exists 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2012-11-07 16:57:31 +01:00
Steven Armstrong
8f525fbc83 __apt_update_index: ignore top level directory 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2012-11-07 16:57:30 +01:00
Steven Armstrong
7e951fd4d1 __apt_ppa: /installed/present/ 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2012-11-07 16:57:30 +01:00
Steven Armstrong
03cc2a63b1 types to handle autofs maps 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2012-11-07 16:57:30 +01:00
Steven Armstrong
7a1f81dc7b remove install types 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2012-11-07 16:54:34 +01:00
Nico Schottelius
1bb3c82d72 cleanup some logging stuff 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-07 11:47:26 +01:00
Nico Schottelius
7d57d1df79 update emulator tests to work again 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-07 11:05:40 +01:00
Nico Schottelius
e2e1d0bb67 include % 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-07 11:05:29 +01:00
Nico Schottelius
4dd0f61934 --whitespace 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-07 10:51:13 +01:00
Nico Schottelius
217d2bcb23 Fix test: StdinTestCase 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-07 10:49:51 +01:00
Nico Schottelius
45d5e4719a read from stdin using read, not buffer.read() to be compatible with other IO streams 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-07 10:49:11 +01:00
Nico Schottelius
1e4833781e distinguish between user supplied and derived manifest on error printing 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-07 10:48:30 +01:00
Nico Schottelius
a32d3abd33 allow to pass in environment into emulator 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-07 10:25:47 +01:00
Nico Schottelius
7b51e22922 allow to read stdin from different handle than sys.stdin in emulator 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-07 09:58:47 +01:00
Nico Schottelius
e785092935 allow Manifest to differentiate between supplied and implicit found initial manifest 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-07 09:07:18 +01:00
Nico Schottelius
9cf80f5fdf make use of env provided by manifest 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-06 22:39:25 +01:00
Nico Schottelius
6482863c5d allow manifest to return env for usage from external 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-06 22:32:18 +01:00
Nico Schottelius
28bf0c3ed8 setup target_host for tests in test main class 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-06 21:52:11 +01:00
Nico Schottelius
aedb3669c7 print hint if initial manifest is missing 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-06 21:46:02 +01:00
Nico Schottelius
866f23ea2c inject conf_dir for emulator test 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-06 21:32:54 +01:00
Nico Schottelius
a22e729a3c raise special error on missing manifest 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-06 21:32:37 +01:00
Nico Schottelius
c47d0fae1c fix autorequire test case and fix cdist_base_path test assignment 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-06 17:28:26 +01:00
Nico Schottelius
bb1a8d8e66 fixup manifest tests 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-06 17:01:20 +01:00
Nico Schottelius
04bd5d88c3 Fix tests for code 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-06 16:58:30 +01:00
Nico Schottelius
4a67d768d5 fix all explorer test cases 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-06 16:47:51 +01:00
Nico Schottelius
b6f61a632f __postgres_role: switch to boolean, use shortcut version 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-02 22:56:45 +01:00
Nico Schottelius
03d224c74c add hint to db from role 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-02 22:43:19 +01:00
Nico Schottelius
5308d2cfe7 link to role from database 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-02 22:35:52 +01:00
Nico Schottelius
0eac132b83 adjust gemset explorer to work with new rvm version (fixes #108) 
See https://github.com/wayneeseguin/rvm/issues/1285

Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-02 21:46:08 +01:00
Nico Schottelius
df88d98ea0 many cleanups to __rvm* types 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-02 17:35:13 +01:00
Nico Schottelius
d5955bbb4d reference dependency package as well 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-02 17:19:30 +01:00
Nico Schottelius
c779e16fe2 __rvm: use shortcut version 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-02 17:18:57 +01:00
Nico Schottelius
d97f6794d0 run rvm as user, not as root 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-02 17:16:25 +01:00
Nico Schottelius
13fc5aa8f5 use shortcut version to exit if nothing is to be done 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-02 17:15:16 +01:00
Nico Schottelius
5eac7512a5 fix dependencies for __rvm_ruby 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-02 17:04:00 +01:00
Nico Schottelius
384a20ffbc building ruby requires bzip2 to be present to extract the tar.bz2 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-02 16:58:52 +01:00
Nico Schottelius
90fad0fe83 create remote base in test - needed? 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-02 14:15:14 +01:00
Nico Schottelius
184e2bd9c5 add new remote that does local calls 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-01 18:25:29 +01:00
Nico Schottelius
09fd809032 add new remote handler which turns remote into local ;-) 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-01 18:22:52 +01:00
Nico Schottelius
5ec586f764 begin to cleanup explorer test case 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-01 18:21:56 +01:00
Nico Schottelius
528901bdee update a lot of tests for new exec.local 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-01 15:20:10 +01:00
Nico Schottelius
af24165367 introduce home_dir as a property 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-01 15:17:46 +01:00
Nico Schottelius
69a3844332 fix some tests and fix home_dir lookup 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-01 14:48:51 +01:00
Nico Schottelius
1177286d4e cleanups of tests (especially exec.local) 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-01 14:42:55 +01:00
Nico Schottelius
6ecfb28d93 name parameter correctly add_conf_dirs 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-01 14:14:52 +01:00
Nico Schottelius
6eddaaf090 rename parameter correctly to add_conf_dirs 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-01 13:46:01 +01:00
Nico Schottelius
32a94a0f89 adjust emulator test to pass exec_path to local 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-01 13:35:52 +01:00
Nico Schottelius
4946fe2654 adjust paths in test 2012-11-01 13:34:48 +01:00
Nico Schottelius
6771a13758 pass exec_path from context to local, making it obsolete to manually add the argument to the _link_types_for_emulator 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-01 13:30:45 +01:00
Nico Schottelius
081d3aea37 remove manifests, which are not needed anymore (in production without them for some months) 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-01 11:09:45 +01:00
Nico Schottelius
1d1149deab +debug 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-30 16:36:32 +01:00
Nico Schottelius
c25c986992 re-add sample, but longer name 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-30 16:33:18 +01:00
Nico Schottelius
e7be0cceab big change for pre4 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-30 16:16:59 +01:00
Nico Schottelius
92d21a4625 remove init.sample from this place in the distribution 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-30 16:14:02 +01:00
Nico Schottelius
e41aae041a fix cache_dir syntax error 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-30 16:11:03 +01:00
Nico Schottelius
dcaa70e6be be consistent in remote 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-30 16:07:00 +01:00
Nico Schottelius
cbe95b18e6 rename function to reveal new task: create_files_dirs 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-30 16:06:27 +01:00
Nico Schottelius
1e264afa63 refactor code to allow multiple directories to be passed in 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-30 16:05:37 +01:00
Nico Schottelius
b0e8c23078 initial change to support multiple conf_dirs 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-30 15:59:21 +01:00
Nico Schottelius
6ece8a97c7 use obsolete lib path 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-30 14:54:05 +01:00
Nico Schottelius
63573a9797 make package_data work 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-29 22:50:27 +01:00
Nico Schottelius
85fcfb1744 correct __file link again 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-25 23:48:56 +02:00
Nico Schottelius
3cf59fdf9a always use dynamic version - on shipping included generated version 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-25 23:45:56 +02:00
Nico Schottelius
91c1374657 begin restructering for python package 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-25 23:37:15 +02:00
Nico Schottelius
5d319027d0 Merge branch 'master' into 2.1_pypi_integration 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>

Conflicts:
	.gitignore
	build
 2012-10-25 22:35:20 +02:00
Nico Schottelius
392ec3c5ed correct link to __file 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-25 17:46:19 +02:00
Nico Schottelius
c9f728e073 lib/cdist => cdist (pypi) 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-25 17:21:58 +02:00