Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Georgios Dagkakis
slapos
Commits
cd44f12b
Commit
cd44f12b
authored
Jun 17, 2011
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'upstream'
parents
3f47c450
91630cc6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
37 deletions
+3
-37
00.Repository.Rules.txt
00.Repository.Rules.txt
+0
-34
component/git/buildout.cfg
component/git/buildout.cfg
+2
-2
component/libreoffice-bin/buildout.cfg
component/libreoffice-bin/buildout.cfg
+1
-1
No files found.
00.Repository.Rules.txt
deleted
100644 → 0
View file @
3f47c450
SlapOS repository rules
=======================
Short version for impatient
---------------------------
'master' branch is always stable. One shall never work in this branch. One
shall expect reversion or removal of his commits in 'master' branch, if they
are not because of merging another branch.
Everyone has to create branch, basing on 'master' or any other branch. All
work shall be done in such branch. It is advised to review it before merging
into 'master'. It is very good habit to tag such merges.
A bit more background
---------------------
SlapOS repository 'master' branch is supposed to be stable. No new work is
accepted on this branch. Each time someone uses (clones, extends) 'master'
branch it is supposed to work (as far as it was tested).
Tags on 'master' branch are supposed to be repeatable software definitions
forever. All versions and external links shall be setup in a way, that they
wouldn't change in day, month, year, etc.
Everyone can make his own branch to introduce new software to SlapOS. There
are no rules about those branches, as each software is specific.
It is good idea to ask for review before merging changes into 'master' branch.
Peer review can detect issues not detected by testing, development or self
analysis.
After some software is stabilised and no more work is planned it is acceptable
to remove such abandoned branch in order to minimise amount of branches.
component/git/buildout.cfg
View file @
cd44f12b
...
@@ -13,8 +13,8 @@ parts =
...
@@ -13,8 +13,8 @@ parts =
[git]
[git]
recipe = hexagonit.recipe.cmmi
recipe = hexagonit.recipe.cmmi
url = http://kernel.org/pub/software/scm/git/git-1.7.
3.4
.tar.bz2
url = http://kernel.org/pub/software/scm/git/git-1.7.
4.5
.tar.bz2
md5sum =
3a2602016f98c529cda7b9fad1a6e216
md5sum =
2fa6c4c847ed87523cf55de54af457eb
configure-options =
configure-options =
--with-curl=${curl:location}
--with-curl=${curl:location}
--with-openssl=${openssl:location}
--with-openssl=${openssl:location}
...
...
component/libreoffice-bin/buildout.cfg
View file @
cd44f12b
...
@@ -10,7 +10,7 @@ versions = versions
...
@@ -10,7 +10,7 @@ versions = versions
[versions]
[versions]
# special version of z3c.recipe.openoffice with architecture autodetection
# special version of z3c.recipe.openoffice with architecture autodetection
z3c.recipe.openoffice = 0.3.1dev
7
z3c.recipe.openoffice = 0.3.1dev
8
[libreoffice-bin]
[libreoffice-bin]
recipe = z3c.recipe.openoffice
recipe = z3c.recipe.openoffice
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment