Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,11 @@ source-repository-package
location: https://github.com/wireapp/saml2-web-sso
tag: 74371cd775cb98d6cf85f6e182244a3c4fd48702

source-repository-package
type: git
location: https://gitlab.com/axeman/cql-io
tag: c2b6aa995b5817ed7c78c53f72d5aa586ef87c36

source-repository-package
type: git
location: https://gitlab.com/axeman/swagger
Expand Down
4 changes: 3 additions & 1 deletion cabal.project.freeze
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,6 @@ constraints: any.AC-Angle ==1.0,
any.cpu ==0.1.2,
any.cpuinfo ==0.1.0.2,
any.cql ==4.0.3,
any.cql-io ==1.1.1,
any.cql-io-tinylog ==0.1.0,
any.crackNum ==3.1,
any.crc32c ==0.0.0,
Expand Down Expand Up @@ -1153,6 +1152,8 @@ constraints: any.AC-Angle ==1.0,
any.hourglass ==0.2.12,
any.hourglass-orphans ==0.1.0.0,
any.hp2pretty ==0.10,
any.hpack ==0.34.5,
any.hpack-dhall ==0.5.3,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this added here? don't mind either way, just surprised.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just ran the script in tools/convert-to-cabal to keep stack.yaml and cabal.project in sync. I was confused too, but then thought maybe someone added some dependency and forgot to run that script.

any.hpc-codecov ==0.3.0.0,
any.hpc-lcov ==1.0.1,
any.hprotoc ==2.4.17,
Expand Down Expand Up @@ -2457,6 +2458,7 @@ constraints: any.AC-Angle ==1.0,
any.time-units ==1.0.0,
any.timeit ==2.0,
any.timelens ==0.2.0.2,
any.timeout ==0.1.1,
any.timer-wheel ==0.3.0,
any.timerep ==2.0.1.0,
any.timezone-olson ==0.2.0,
Expand Down
1 change: 1 addition & 0 deletions changelog.d/3-bug-fixes/cql-io-control
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix cql-io bug where restarting whole cassandra cluster could cause downtime. Upstream changes in https://gitlab.com/twittner/cql-io/-/merge_requests/20
5 changes: 4 additions & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,10 @@ extra-deps:
- git: https://gitlab.com/axeman/swagger
commit: e2d3f5b5274b8d8d301b5377b0af4319cea73f9e

# Use forked cql-io for https://gitlab.com/twittner/cql-io/-/merge_requests/20
- git: https://gitlab.com/axeman/cql-io
commit: c2b6aa995b5817ed7c78c53f72d5aa586ef87c36

############################################################
# Wire packages
############################################################
Expand Down Expand Up @@ -215,7 +219,6 @@ extra-deps:

- HsOpenSSL-x509-system-0.1.0.4
- cql-4.0.3
- cql-io-1.1.1
- primitive-extras-0.10.1.1
- text-format-0.3.2
- hex-0.2.0
Expand Down