mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-05-07 11:22:02 -05:00
Code Issues Packages Projects Releases 161 Wiki Activity
21,270 Commits 309 Branches 631 Tags
68aca5f5c19edb111abbe5ffbbfffd5e767db9a0
Commit Graph

21270 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daylon Wilkins 547400a1f4 Merge pull request #6674 from dolthub/Hydrocharged-dcfb1d7e 
[auto-bump] [no-release-notes] dependency by Hydrocharged
 2023-09-15 05:27:49 -07:00
Hydrocharged 164c66251b [ga-bump-dep] Bump dependency in Dolt by Hydrocharged 2023-09-15 10:27:37 +00:00
Dustin Brown 2f425597ba [ga-bump-dep] Bump dependency in Dolt by macneale4 (#6672) 
Co-authored-by: macneale4 <46170177+macneale4@users.noreply.github.com>
 2023-09-14 17:25:35 -07:00
Aaron Son 1e0b2e97a8 go: sqle: cluster: branch_control_replica: Add best-effort wait-for-replicate on graceful-transition-to-standby. 2023-09-14 15:24:07 -07:00
Aaron Son 379099d0f9 go: sqle: cluster: mysqldb_persister: Add best-effort wait-for-replicate on graceful-transition-to-standby. 2023-09-14 15:18:40 -07:00
Jason Fulghum 227b9562bc Merge pull request #6668 from dolthub/fulghum-b7e0fb83 
[auto-bump] [no-release-notes] dependency by fulghum
 2023-09-14 14:46:15 -07:00
Aaron Son 17a1e5019e go: dtestutils: sql_server_driver: Prepend the server stdout output with the server name to make multi-server test logs easier to read. 2023-09-14 14:24:01 -07:00
Aaron Son 1002a5d542 go: sqle: cluster: First pass at replicating branch control permissions. 2023-09-14 13:37:35 -07:00
fulghum 2d3d7cf93b [ga-bump-dep] Bump dependency in Dolt by fulghum 2023-09-14 20:08:47 +00:00
Maximilian Hoffman 26a949d3c5 [no-release-notes] GMS bump for indexing refactor (#6649) 
* [no-release-notes] GMS bump for indexing refactor

* fix log table

* bump fix union test

* bump

* bump
 2023-09-14 09:45:55 -07:00
Daylon Wilkins 6bb5389eb9 Merge pull request #6665 from dolthub/daylon/cli-exposure 
[no-release-notes] Server exposure and GMS bump
 2023-09-14 06:39:54 -07:00
Daylon Wilkins f1036ae083 Server exposure and GMS bump 2023-09-14 05:14:50 -07:00
Dustin Brown c41cf78372 [ga-bump-dep] Bump dependency in Dolt by JCOR11599 (#6658) 
Co-authored-by: JCOR11599 <jcor@ucsd.edu>
 2023-09-13 13:00:50 -07:00
Maximilian Hoffman 42a6769c13 Delete docstring for push (#6657) 2023-09-13 10:24:16 -07:00
Dustin Brown 533f358e56 [ga-bump-dep] Bump dependency in Dolt by JCOR11599 (#6655) 2023-09-12 22:35:51 -07:00
zachmu d95d47101f [ga-bump-release] Update Dolt version to 1.15.0 and release v1.15.0 v1.15.0 2023-09-13 00:12:12 +00:00
stephanie 7d18cdd489 Merge pull request #6654 from dolthub/steph/stored-proc-output 
Standardize stored procedure success output messages
 2023-09-12 17:03:52 -07:00
Stephanie You 17021d6cd4 standardize stored procedures to return status 0 on success 2023-09-12 15:18:59 -07:00
Zach Musgrave 93aeb0c8cb Merge pull request #6635 from dolthub/zachmu/replication-force 
Change default of replication pull to force
 2023-09-12 15:11:16 -07:00
stephanie e7ea090fff Merge pull request #6651 from dolthub/steph/log-fix 
fixes log panic
 2023-09-12 14:14:31 -07:00
stephanie 3611804488 Merge pull request #6647 from dolthub/steph/status 
fix formatting issue in status
 2023-09-12 14:12:29 -07:00
stephkyou e3b6c97b54 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2023-09-12 19:59:26 +00:00
Stephanie You 27277c2d46 fix missing return statement 2023-09-12 12:48:29 -07:00
Stephanie You bea4f4514f add remote test for fetch 2023-09-12 12:44:04 -07:00
Stephanie You c597d50b43 blocks fetch against remote hosts 2023-09-12 12:29:16 -07:00
Stephanie You d5256c90b4 migrate dolt fetch to use sql 2023-09-12 12:29:16 -07:00
Stephanie You e3f18a9f60 adds missing return for error 2023-09-12 12:22:15 -07:00
zachmu 004d5b9046 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2023-09-12 18:53:22 +00:00
Zach Musgrave b0b898d837 Remove dead code 2023-09-12 11:36:09 -07:00
James Cor 021d3e6463 updating description for query diff (#6640) 
Co-authored-by: James Cor <james@dolthub.com>
 2023-09-12 11:34:26 -07:00
Stephanie You fc6ea6df92 fix formatting issue in status 2023-09-12 11:25:45 -07:00
Zach Musgrave a59ba569e2 Update go/cmd/dolt/commands/pull.go 
Co-authored-by: Aaron Son <aaron@dolthub.com>
 2023-09-12 11:18:19 -07:00
Zach Musgrave 1358aa845f Update go/libraries/doltcore/merge/action.go 
Co-authored-by: Aaron Son <aaron@dolthub.com>
 2023-09-12 11:18:12 -07:00
Zach Musgrave b38b002930 Update go/libraries/doltcore/sqle/dprocedures/dolt_merge.go 
Co-authored-by: Aaron Son <aaron@dolthub.com>
 2023-09-12 11:18:07 -07:00
Zach Musgrave 8aa8ebd337 Fix test 2023-09-12 10:19:30 -07:00
Zach Musgrave 39cf00505f Removed redundant tests left over from stored procedure migration 2023-09-12 10:12:57 -07:00
zachmu 7c71476bab [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2023-09-12 00:47:49 +00:00
Zach Musgrave 8358408891 Much simpler version with correct fast-forward output, thanks aaron 2023-09-11 17:36:14 -07:00
Zach Musgrave 3c3db5cb7a Making sure divergent head pulls aren't a fast-forward 2023-09-11 17:35:15 -07:00
Zach Musgrave d8ad69ea61 Dolt_pull() behavior and bats test 2023-09-11 16:59:44 -07:00
Zach Musgrave c398225c62 Bats tests for merging remote tracking branch 2023-09-11 16:33:06 -07:00
Zach Musgrave 717da1c923 Cleaned up pull spec 2023-09-11 16:25:33 -07:00
Zach Musgrave 9f6a0adaf3 More cleanup of msg 2023-09-11 16:19:11 -07:00
Zach Musgrave 2e296758e3 Removed unused msg param 2023-09-11 16:14:52 -07:00
Zach Musgrave d9353ea1a3 Cleanup 2023-09-11 15:52:51 -07:00
Zach Musgrave 6f3beabf98 Attempt to perform merge of remote ref and tracking ref 2023-09-11 15:08:07 -07:00
macneale4 dc12013e38 [ga-bump-release] Update Dolt version to 1.14.1 and release v1.14.1 v1.14.1 2023-09-11 19:49:42 +00:00
Zach Musgrave 7937a3f383 Merge branch 'zachmu/replication-force' of github.com:dolthub/dolt into zachmu/replication-force 2023-09-11 12:24:05 -07:00
Zach Musgrave 1a0de31f7b implement force pull 2023-09-11 12:20:21 -07:00
Jason Fulghum cdf1909ba5 Merge pull request #6637 from dolthub/fulghum/bugfix 
Bug fix: Check constraint merging
 2023-09-11 12:12:56 -07:00