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.

Sign up for GitHub

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

Jump to bottom

can changes go back to incubaid? #566

Open
wants to merge 554 commits into
base: 1.8
Choose a base branch
from
Open

can changes go back to incubaid? #566

wants to merge 554 commits into from

Conversation

despiegk
Copy link

@despiegk despiegk commented Feb 21, 2016 •
edited
Loading

or do I make a mistake here?

@domsj
Copy link
Contributor

domsj commented Jun 21, 2016

I think you can do as you please ... the incubaid repo is all yours.
Do note that the license has changed from apache 2 to agpl.
And you're merging our 1.9 branch into a 1.8 branch on this repo.

Romain Slootmaekers and others added 29 commits August 17, 2016 10:17
make it work with git
eb792a8
Merge pull request #115 from openvstorage/setup.py2git
993b39d 
make it work with git
add cmx files in installed client
fb337d7
Merge pull request #117 from openvstorage/cmx
00af358 
add cmx files in installed client
@domsj
sigh centos
7f4f6fa
@domsj
Merge pull request #119 from openvstorage/centos-sigh
f1701fa 
sigh centos
@domsj
disable travis cache as it currently makes the build fail due to a la…
36b2070 
…ck of space
assert serialization of counted lists
4eccd9c
@domsj
Merge pull request #120 from openvstorage/travis
357aa29 
disable travis cache as it currently makes the build fail due to a la…
Merge pull request #121 from openvstorage/assert_counted_list_ser
5160605 
assert serialization of counted lists
@domsj
introduce client config ini format, which includes tls info
c335df4
@domsj
allow getting arakoon config from another arakoon
2000bc8
@domsj
update arakoon_client.mllib
e1a0838
@domsj
implement to_ini for arakoon_client_config
4a5e35c
fix config bug tlog_max_size
f4895c3
@HarukaMa
fix build
d44b3b4
autofix for missing .tlog file and (failing) test
5fcc0da
@domsj
bugfix
a4e7dff
bug fix: correct iterate for tiny tlogs
ff458c9
remove cucu
63ccbc4
@domsj
Merge pull request #124 from openvstorage/client-config
9cecd98 
Expanded arakoon client config + allow getting config from another arakoon
Merge branch '1.9' into issue_125
01b3250
conditionally remove database
e23bcd1
Merge pull request #127 from openvstorage/issue_125
f283d14 
Issue 125
@domsj
skip leading slash in arakoon config path
f49df62
@domsj
Merge pull request #129 from openvstorage/arakoon-config-path
5670692 
skip leading slash in arakoon config path
verify_store;get-raw; set < file
b9ae34e
Merge pull request #130 from openvstorage/verify_db
8cbfc4d 
verify_store;get-raw; set < file
removed 'down', loop when not canceled
4b93dac
andersfugmann and others added 30 commits May 2, 2018 12:48
@andersfugmann
Merge pull request #228 from openvstorage/update_meta_dependencies
0d73bb8 
Add core to the list of dependencies for arakoon client
allow DeletePrefix in a Sequence
04c2ed3
Merge pull request #231 from openvstorage/DeletePrefix_in_sequence
b156078 
allow DeletePrefix in a Sequence
allows catchup-only to pick a specific node
929a5b6
vendoring camltc package
7e49a30
sourceNode parameter in cluster mgmt
e91c78d
Merge pull request #233 from openvstorage/specific_catchup_only
cf414ab 
Specific catchup only
deprecate fsync, replace with fsync_interval and fsync_entries
7a5a24d
Merge pull request #234 from openvstorage/fsync_knobs
b1752e5 
deprecate fsync, replace with fsync_interval and fsync_entries
@JeffreyDevloo
Update pyrakoon to the refactored branch
d99fa38
Merge pull request #235 from openvstorage/1.9_update_submodule
636d724 
Update pyrakoon to the refactored branch
add test for inspect
f205068
move inspect to common to make it usable outside of test
c09c0e2
remove compiler warning
b207eb8
restoring dump_store in all its optional grandor
74296a4
restart_master_long times 3
1c3fd64
jenkins can't handle it
020ddaa
Merge pull request #236 from openvstorage/test_inspect
fd43c74 
Test inspect
instead of competing, let the other racing slave win
aab3fcc
latest pyrakoon
80b3ac6
Merge pull request #237 from openvstorage/multi_paxos_improvement
21c44c6 
instead of competing, let the other racing slave win
adds AssertRange to python client
9ca7986
@toolslive
Merge pull request #238 from openvstorage/python_assert_range
ed38d2c 
Python assert range
move to 4.07.1
f03adee
@toolslive
Merge pull request #239 from openvstorage/4.07.1
de8d51b 
4.07.1
clean $TEST_HOME/tmp
c197304
removed Jan Doms as author (upon his request)
87319ce
Merge branch '1.9' of github.com:openvstorage/arakoon into 1.9
1859133
smoother jenkins experience (no more out of memory)
44efb7d
Merge pull request #62 from openvstorage/fix_jenkins
1843981 
smoother jenkins experience (no more out of memory)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@despiegk @domsj @HarukaMa @JeffreyDevloo @delamonpansie @andersfugmann @toolslive