kylefang/stacks-puppet-node
1
0
Fork 0
mirror of https://github.com/alexgo-io/stacks-puppet-node.git synced 2026-04-28 19:55:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
15,480 Commits 654 Branches 178 Tags
e3ad0c8aa6f1c4e702f66ea8c37aa299277831ff
Commit Graph

15480 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aaron Blankstein
e3ad0c8aa6 docs: add optionality on when to open develop->master PR 2021-06-30 08:03:00 -05:00
Aaron Blankstein
17621c845d Update README.md 
Co-authored-by: Ludo Galabru <ludovic@blockstack.com>
 2021-06-29 15:08:53 -05:00
Aaron Blankstein
aed42aaf5a Update README.md 
Co-authored-by: Ludo Galabru <ludovic@blockstack.com>
 2021-06-29 15:08:46 -05:00
Aaron Blankstein
f2ed3294a4 Update README.md 
Co-authored-by: Ludo Galabru <ludovic@blockstack.com>
 2021-06-29 15:08:39 -05:00
Aaron Blankstein
8161a74d07 Merge branch 'feat/doc-release-process' of github.com:blockstack/stacks-blockchain into feat/doc-release-process 2021-06-29 09:54:56 -05:00
Aaron Blankstein
227914954d docs: address PR feedback 2021-06-29 09:54:47 -05:00
Aaron Blankstein
c6da0caef1 Merge branch 'develop' into feat/doc-release-process 2021-06-29 09:54:34 -05:00
Gregory Coppola
d183315026 Merge pull request #2702 from blockstack/fix/rust-warnings2 
[clean-up] Fix build warnings in 'cargo build'
 2021-06-21 12:31:31 -05:00
CharlieC3
abb23d298a docs: add info on creating release candidate, and Hiro testing envs 2021-06-21 13:05:35 -04:00
Aaron Blankstein
5e82dedcd2 docs: adding release process to README.md 2021-06-21 11:48:16 -05:00
Aaron Blankstein
84f13f2cf6 Merge branch 'develop' into fix/rust-warnings2 2021-06-18 10:04:35 -05:00
Aaron Blankstein
3782578689 Merge pull request #2715 from blockstack/chore/integration-tests 
chore: try to speed up some integration tests
 2021-06-18 10:02:40 -05:00
Jude Nelson
e197cb9518 Merge branch 'develop' into chore/integration-tests 2021-06-18 05:43:41 +00:00
Jude Nelson
5d6cfd9137 Merge branch 'develop' into fix/rust-warnings2 2021-06-18 05:42:48 +00:00
Jude Nelson
57736657c1 Merge pull request #2684 from blockstack/feat/clarity-cli-serialized-output 
Feat/clarity cli serialized output
 2021-06-18 05:38:18 +00:00
Aaron Blankstein
413d86519f Merge branch 'develop' into chore/integration-tests 2021-06-16 16:26:50 -05:00
Aaron Blankstein
9aab4e37f8 test: oops, flip equality in /v2/info loop 2021-06-16 14:10:34 -05:00
Aaron Blankstein
ab54c4c895 test: wait for microblock to be processed before fetching /v2/info, use loop on wait_for_microblocks 2021-06-16 13:58:48 -05:00
Aaron Blankstein
1811586ad0 dont assert microblocks bumped -- it could have been bumped before the call to wait_for_microblocks 2021-06-16 12:35:26 -05:00
Reed Rosenbluth
2efe18b148 Merge branch 'develop' into feat/clarity-cli-serialized-output 2021-06-16 13:25:23 -04:00
Aaron Blankstein
2117fe7a9d test: use wait_for_microblocks rather than a wait_ms 2021-06-16 12:23:11 -05:00
Gregory Coppola
de6f2bed95 Merge branch 'develop' into fix/rust-warnings2 2021-06-16 12:03:41 -05:00
Aaron Blankstein
16a20520f9 chore: remove infinite loop in microblock_integration test 2021-06-16 09:39:23 -05:00
Aaron Blankstein
02ecae62e0 Merge pull request #2711 from blockstack/fix/2710-mocknet 
fix: logic bug in mocknet/helium miner #2710
 2021-06-15 16:03:41 -05:00
Aaron Blankstein
d8b1c977aa chore: try to speed up some integration tests 2021-06-15 16:01:12 -05:00
Aaron Blankstein
5167546ef9 Merge branch 'develop' into fix/2710-mocknet 2021-06-15 13:42:23 -05:00
Aaron Blankstein
f14d11eb02 Merge pull request #2709 from blockstack/chore/remove-tini 
Chore: remove tini dependency
 2021-06-15 11:49:23 -05:00
Jude Nelson
3db274c4e6 Merge branch 'develop' into chore/remove-tini 2021-06-15 15:30:11 +00:00
Gregory Coppola
e84e9bf759 Merge branch 'develop' into fix/rust-warnings2 2021-06-14 18:55:11 -05:00
Gregory Coppola
b86576c89f Merge pull request #2676 from blockstack/fix/string-docs 
[docs] Add some string-ascii and string-utf8 types to the docs
 2021-06-14 18:53:27 -05:00
Aaron Blankstein
d7ea4772d2 Merge branch 'develop' into chore/remove-tini 2021-06-14 17:19:38 -05:00
Greg Coppola
105cf37db3 Removed a trailing space character. 2021-06-14 16:23:52 -05:00
pavitthrap
5929f3f823 Merge branch 'develop' into fix/string-docs 2021-06-14 16:59:32 -04:00
pavitthrap
9ca70dca36 Merge pull request #2653 from blockstack/fix/microblocks-miner-emit 
fix: emit microblocks mined by the node itself, add microblock hashes
 2021-06-14 16:59:12 -04:00
pavitthrap
52c96dc945 Merge branch 'develop' into fix/2710-mocknet 2021-06-14 15:44:52 -04:00
Pavitthra Pandurangan
1efb4a9e3b Removed a TODO, the question it relates to is now in issue #2712 2021-06-14 14:53:15 -04:00
Aaron Blankstein
f4ce327259 Merge branch 'develop' into feat/clarity-cli-serialized-output 2021-06-14 13:24:08 -05:00
Aaron Blankstein
c2ade99373 Merge branch 'develop' into fix/microblocks-miner-emit 2021-06-14 13:09:46 -05:00
Aaron Blankstein
a1ca772ab0 Merge branch 'develop' into chore/remove-tini 2021-06-14 13:07:14 -05:00
Aaron Blankstein
cc0ba62319 Merge pull request #2694 from blockstack/fix/2644-rbf-check 
Fix: #2644 reorder UTXO staleness and RBF-limit check
 2021-06-14 13:05:21 -05:00
Aaron Blankstein
06d7274354 fix: logic bug in mocknet/helium miner #2710 2021-06-14 12:04:31 -05:00
Greg Coppola
ab21f2a2cd Reverting files to the 'develop' branch versions 2021-06-14 11:53:50 -05:00
Greg Coppola
1030b75364 Trying to rever CHANGELOG.md 2021-06-14 11:52:50 -05:00
Greg Coppola
662fca91fb removed some files that aren't in 'develop' 2021-06-14 11:48:42 -05:00
Greg Coppola
66ba215d67 Merge branch 'fix/string-docs' of github.com:blockstack/stacks-blockchain into fix/string-docs 2021-06-14 11:46:54 -05:00
Greg Coppola
f24da4b8c5 Fixed some typos 2021-06-14 11:46:36 -05:00
Greg Coppola
4984611c1e Fixed a vm:docs test case 2021-06-14 11:38:54 -05:00
Aaron Blankstein
b076b8c95b chore: remove tini dependency 2021-06-14 11:02:51 -05:00
Jude Nelson
865d9568e5 Merge branch 'develop' into fix/2644-rbf-check 2021-06-14 15:13:25 +00:00
Jude Nelson
836ea7037b Merge branch 'develop' into fix/string-docs 2021-06-14 15:12:57 +00:00