Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Versionvirtual #24399

Merged
merged 3 commits into from
Jun 4, 2015
Merged

Versionvirtual #24399

merged 3 commits into from
Jun 4, 2015

Conversation

kiorky
Copy link
Contributor

@kiorky kiorky commented Jun 4, 2015

This refs #24397

should be merged with #24397 & #24398

Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
This refs #24397

Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
@kiorky
Copy link
Contributor Author

kiorky commented Jun 4, 2015

@basepi this one will conflict on develop, take the line with pr version (with the pkg.version thing)

@kiorky
Copy link
Contributor Author

kiorky commented Jun 4, 2015

i ve arranged to limit the conflict as there are big identation mismatchs....

@kiorky
Copy link
Contributor Author

kiorky commented Jun 4, 2015

so the real fix is 235c78d

@kiorky kiorky closed this Jun 4, 2015
@kiorky kiorky reopened this Jun 4, 2015
@jfindlay jfindlay added State-Module Minor Change Platform Relates to OS, containers, platform-based utilities like FS, system based apps labels Jun 4, 2015
@kiorky kiorky closed this Jun 4, 2015
@kiorky kiorky reopened this Jun 4, 2015
basepi added a commit that referenced this pull request Jun 4, 2015
@basepi basepi merged commit 27f109b into saltstack:2015.5 Jun 4, 2015
@kiorky kiorky deleted the versionvirtual branch June 8, 2015 17:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Platform Relates to OS, containers, platform-based utilities like FS, system based apps State-Module
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants