merge android_support in master #186
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… AND Android machines
…ed tools even without the linux class
…re linux classes were used
…e 3.4, and fixed the android system settings techniques with values wanted for the demo
…nexistent variables
…uese and the screen resolution changing method
mobile devices are rarely registered in DNS.
…droid_support_2.5 skipidentify for android
Android version of run-inventory is available in the cfengine android repo The behavior is supposed to be the same even if some arguments are ignored (for now)
Add a rudder_curl var to factorise code
add android when it just works
OCSInventory does not support ACCESSLOG (but fusioninventory does) We add this node in cfengine. An possible improvement is to check for the existence of this node before adding it in order to be compatible with fusioninventory
We cannot use after_location("<CONTENT>") because it is already used with add_information_*.
According to doc this do not converge (we sometime observe 2 ACCESSLOG tag).
We simply use another tag (OPERATINGSYSTEM) in the same hierarchy.
…droid_support_2.5 Branches/rudder/android support 2.5
Conflicts: initial-promises/node-server/common/1.0/site.cf initial-promises/node-server/failsafe.cf initial-promises/node-server/inventory/1.0/fusionAgent.cf initial-promises/node-server/promises.cf techniques/fileConfiguration/fileManagement/1.0/manageFilesAndFolders.st techniques/fileConfiguration/fileManagement/1.1/manageFilesAndFolders.st techniques/fileDistribution/checkGenericFileContent/1.0/checkGenericFileContent.st techniques/fileDistribution/checkGenericFileContent/2.0/checkGenericFileContent.st techniques/fileDistribution/checkGenericFileContent/2.1/checkGenericFileContent.st techniques/fileDistribution/checkGenericFileContent/3.0/checkGenericFileContent.st techniques/fileDistribution/checkGenericFileContent/3.1/checkGenericFileContent.st techniques/fileDistribution/checkGenericFileContent/3.2/checkGenericFileContent.st techniques/fileDistribution/copyGitFile/1.1/copyFileFromSharedFolder.st techniques/fileDistribution/copyGitFile/1.2/copyFileFromSharedFolder.st techniques/fileDistribution/copyGitFile/1.3/copyFileFromSharedFolder.st techniques/fileDistribution/downloadFile/1.0/downloadFile.st techniques/jobScheduling/jobScheduler/1.0/job_scheduler.st techniques/system/common/1.0/failsafe.st techniques/system/common/1.0/promises.st techniques/system/common/1.0/site.st techniques/system/inventory/1.0/fusionAgent.st
now that the copy is done in failsafe, we need set skipidentify here
This technique should not depend on any particular OS
Closed
|
updated with #222 |
amousset
pushed a commit
to amousset/rudder-techniques
that referenced
this pull request
Dec 8, 2015
…lasspath_syntax Fixes #3314: Jetty extra classpath are separated with comma, not column
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As request in #98 , here is the merge of android_support to the master branch.
Lot of fun fixing conflict :-)